From 7923ccdaf3e1452317a11b2754f10b74549ded80 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Sun, 23 Sep 2007 12:56:11 +0100 Subject: [PATCH] Fix the build after AMD IOMMU patches. Signed-off-by: Keir Fraser --- xen/arch/x86/hvm/svm/amd_iommu/amd-iommu-detect.c | 2 +- xen/arch/x86/hvm/svm/amd_iommu/pci-amd-iommu.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/svm/amd_iommu/amd-iommu-detect.c b/xen/arch/x86/hvm/svm/amd_iommu/amd-iommu-detect.c index 8a8340cad0..c4c8af3c92 100644 --- a/xen/arch/x86/hvm/svm/amd_iommu/amd-iommu-detect.c +++ b/xen/arch/x86/hvm/svm/amd_iommu/amd-iommu-detect.c @@ -103,7 +103,7 @@ int __init get_iommu_capabilities(u8 bus, u8 dev, u8 func, u8 cap_ptr, if ( (mmio_bar == 0) || ( (mmio_bar & 0x3FFF) != 0 ) ) { dprintk(XENLOG_ERR , - "AMD IOMMU: Invalid MMIO_BAR = 0x%lx\n", mmio_bar); + "AMD IOMMU: Invalid MMIO_BAR = 0x%"PRIx64"\n", mmio_bar); return -ENODEV; } diff --git a/xen/arch/x86/hvm/svm/amd_iommu/pci-amd-iommu.c b/xen/arch/x86/hvm/svm/amd_iommu/pci-amd-iommu.c index 260589f560..8b99a78257 100644 --- a/xen/arch/x86/hvm/svm/amd_iommu/pci-amd-iommu.c +++ b/xen/arch/x86/hvm/svm/amd_iommu/pci-amd-iommu.c @@ -224,8 +224,8 @@ struct amd_iommu *find_iommu_for_device(int bus, int devfn) return NULL; } -void amd_iommu_setup_domain_device(struct domain *domain, - struct amd_iommu *iommu, int requestor_id) +void amd_iommu_setup_domain_device( + struct domain *domain, struct amd_iommu *iommu, int requestor_id) { void *dte; u64 root_ptr; @@ -244,8 +244,8 @@ void amd_iommu_setup_domain_device(struct domain *domain, root_ptr, hd->domain_id, hd->paging_mode); dprintk(XENLOG_INFO, "AMD IOMMU: Set DTE req_id:%x, " - "root_ptr:%lx, domain_id:%d, paging_mode:%d\n", - requestor_id, root_ptr, hd->domain_id, hd->paging_mode); + "root_ptr:%"PRIx64", domain_id:%d, paging_mode:%d\n", + requestor_id, root_ptr, hd->domain_id, hd->paging_mode); spin_unlock_irqrestore(&iommu->lock, flags); } -- 2.30.2